Merge branch 'development' of https://github.com/iankahn/CMSC434Clock into development

Conflicts:
app/src/main/java/android/hci/hciclock/MainActivity.java
Merge

Manual Merge