Cleaned project files
Merge branch 'master' of https://github.com/dtyndall/CelebrationApp.git

Conflicts:
	CelebrationApp/src/com/example/celebrationapp/MainActivity.java
Merge branch 'master' of https://github.com/dtyndall/CelebrationApp.git