updated MainActivity.java to return a list of events and changed CalEvent.java
Merge branch 'master' of https://github.com/eatonk/MHacks-NoRingOnIt