Merged
merge
commit
Merge branch 'sprint3' into sprint2

Conflicts:
	Hackathon[2014]/gen/.gitignore
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java