change the upload url
change server port to 5000
change server port back to 3000
Merge pull request #4 from liuwei/master

Add waterfall layout and take picture when first show

Need watch application_layout.ejs and application.css
fixed font-awesome
refine home page
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	README.md
	public/stylesheets/show.css
Add wireframe