Added button images. Some are not used yet and two are not done and therefore not commited. Changed android:src --> android:background in acitivty_main.xml. Changed order on the two layouts included in acitivty_main and changed background color.
added files, mainActivity
Merged testbranch
Created navigation menu fragment
Merge branch 'master' of https://github.com/Hyperactivity/android-app
Fixed height of navigation menu
Merge branch 'master' of https://github.com/Hyperactivity/android-app