Too tired to talk
Merge branch 'master' of https://github.com/andrew749/Hive
Merge branch 'master' of https://github.com/andrew749/Hive
Merge branch 'master' of https://github.com/andrew749/Hive
new files
Merge branch 'master' of https://github.com/andrew749/Hive

Conflicts:
	Hive/app/build.gradle
	Hive/app/src/main/java/com/yhacks2014/hive/AddEventActivity.java
	Hive/app/src/main/java/com/yhacks2014/hive/fragments/TimePickerFragment.java
	Hive/app/src/main/res/layout/fragment_time_picker.xml