new update 2-18
changed number of icons
Merged with upstream, sent pull request after adding database class.
updated gym activity with calendar
fixed conflicts
Merge pull request #49 from rramsaro/schedule-feature

Added Class to Create Database
deleted .files
Merge pull request #53 from Lhernand/master

gym
fixed layout for gym activity
Merge pull request #54 from crystalist/master

fixed layout for gym activity
.project .classpath added
gitignore updated
.classpath added
Changed GUI
Merge remote-tracking branch 'upstream/master'
Merge pull request #55 from thaives/master

Change GUI
todo list added to menu
Merge pull request #56 from crystalist/master

Added Todo activity to main menu
Creating add screen
Merge remote-tracking branch 'upstream/master' into schedule-feature

Conflicts:
	AndroidManifest.xml
	res/layout/activity_direction.xml
	res/layout/activity_ggcdirectory.xml
	res/values/strings.xml