stylesheets
fixed conflicts
stylesheet update
Merge branch 'master' of https://github.com/umass-cs-326/team-pinndit
Merge branch 'master' of https://github.com/umass-cs-326/team-pinndit

Conflicts:
	pinndit-app/public/javascripts/pinndit.js
updated stylesheet
stylesheet