testing unit tests with travis
Merge branch 'master' of https://github.com/CSC309-SoftwareEngineering/Marccello

Conflicts:
	log/development.log