cecile put step 1 page
Merge branch 'master' of github.com:jasonou/lettergram

Conflicts:
	.DS_Store
	app/views/gallery/new.html.erb