Changed the copyright to include year and all our names.
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project

Conflicts:
	LICENSE
Updated license and README
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project