added corkboard
Merge branch 'master' of github.com:samuel-hill/ga-wdi-hackathon

Conflicts:
	app/assets/stylesheets/styles.css
	app/views/collages/index.html.erb
Merge branch 'master' of github.com:samuel-hill/ga-wdi-hackathon
added missing bracket