Initial setup
Merge branch 'master' of https://github.com/dbousamra/android-hackathon

Conflicts:
	.gitignore
	project.properties
	src/com/example/androidhackathon/AndroidHackathonActivity.java
Merge branch 'master' of https://github.com/dbousamra/android-hackathon
Merge branch 'master' of https://github.com/dbousamra/android-hackathon