javascript
Merge branch 'master' of https://github.com/hsin421/Microblog

Conflicts:
	Public/main.css
	Views/profile.erb
	app.rb
Heroku
Heroku