First commit
Merge branch 'master' of git@github.com:billabrian6/Dawncrafter.git

Conflicts:
	Project/bin/Project.apk
	Project/bin/resources.ap_
	Project/gen/com/example/project/R.java