Merge branch 'feature/f1_image_upload' into develop
Ready push to heroku
將按鈕由藍色改成綠色
Merge pull request #1 from noni2she/develop

將按鈕由藍色改成綠色
首頁建立 done
Nav bar done
排版設定完成
Merge branch 'master' of heroku.com:franky-store

Conflicts:
	app/views/layouts/application.html.erb
fix applicatinon in diff of heroku master