merged with gui
Merge branch 'braden' into GUI

Conflicts:
	src/classes/mockout/mocklog.txt
 merged with braden and added mocklog.txt to .gitignore
added legend to calendar view
merged with braden
removed weird files
removed weird files and added legend
Merge branch 'braden' into GUI
added checklogin back
added statistics to qtip
Merge branch 'braden' into GUI
Merge branch 'ryan' of https://github.com/Mekapaedia/deardiary into ryan