Temp Scaffold
Merge branch 'master' of https://github.com/fa6ian/pinteresting

Conflicts:
	app/views/pins/_form.html.erb
	app/views/pins/index.html.erb