Added .settings/ to .gitignore
Coppied gitignor from master so .setting will be ignored
Added the mockups to documentation
Added Category object class
Added ListObject object class
Added category variable (and get/set) in ListObject
Testing git..
Added time object class
Added Time to ListObject with get and set
Added new object class Place
Added Place to ListObject with get and set
Added new object class TimeAlarm
Added TimeAlarm to ListObject with get and set
Added new object class GPSAlarm
Added testFragment
Added GPSAlarm to ListObject with get and set
Added TestFragment.java
MainActivity is now using a drawer layout
Added support for multiple categories
Fixed some trivial conflict