Mass added
Mass added 2nd try

why?
Merge branch 'master' of https://github.com/bmarcott/cs275

Conflicts:
	main.cpp