Initial commit
Created Android project
Some more things for the project
Some more that was missed
Merge branch 'master' of https://github.com/Hyperactivity/android-app
Added some res files
Fixed the gitignore file
Merge branch 'master' of https://github.com/Hyperactivity/android-app
added file
Merge pull request #9 from Hyperactivity/marcus

I added a file and want to test this pull request thing
Added Settings to the Action Bar and added possible navigation to Settings
Closes #8
Added lock button and it's corresponding text
Merge pull request #11 from Hyperactivity/lucas

Login page, Closes #8
.gitignore is now working
Removed test file
#10 #6 Added support for Android version 2.1 to 4.2
.gitignore is now working
Changed bad variable names for buttons.
Resolved our issues