New Project created with working hourglass class
Merge branch 'master' of https://github.com/jamwjam/CMSC434-IA05

Conflicts:
	Hourglass/.idea/modules.xml
	Hourglass/app/app.iml
	Hourglass/app/src/main/AndroidManifest.xml
	Hourglass/app/src/main/res/layout/activity_main.xml
merging changes

Deleted hourglass custom view and merged relevant items into hourglass