Fixed bug with Event constructor
Merge branch 'master' of https://github.com/cs2103aug2014-t13-1c/main

Conflicts:
	BoxIn/BoxIn/BoxIn.vcxproj