merged from chelsea
second try on merging
Merge branch 'master' of https://github.com/syncsophia/CS3213_Assignment1.git