not important
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole

Conflicts:
	Team10ProjectW2014/.classpath
dunno
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole