C
Files that should've been com
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.classpath
	tomcat/logs/catalina.out
	tomcat/webapps/ROOT
Changes to the date format.
Merge branch 'master' of https://github.com/conor-mac-aoidh/MoodNooz