merge code, and adjust code

This commit is contained in:
Christian Schabesberger 2016-02-05 17:09:29 +01:00
parent 241414f81b
commit 7cc1c0fbdd
29 changed files with 412 additions and 727 deletions

View file

@ -18,7 +18,6 @@ Project status:
[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.png)
## Description