Implemented photo capture
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
new font
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Got the spalsh screen working
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/src/main/java/hack/com/waterfountain/Background/UploadPhotoTask.java
	app/src/main/java/hack/com/waterfountain/MainActivity.java
	app/src/main/java/hack/com/waterfountain/Support/Util.java
Got the spalsh screen working