First commit done correctly! 
also figured out the graphical layout editor problem
Merge branch 'master' of https://github.com/GitHub-Pirates/lab1

Conflicts:
	Lab1/res/values/strings.xml