Fixed conflict
Merge branch 'master' of https://github.com/akhoatran/CS169-AMASS

Conflicts:
	app/assets/stylesheets/application.css