Merge branch 'master' of https://github.com/jamescheuk514/pinteresting

Conflicts:
	app/views/layouts/_navbar_upload_menu.html.erb
	app/views/pins/index.html.erb
	app/views/pins/show.html.erb
	config/routes.rb
fix a bug where photo too large
change the README.rm
solve conflict in index and show