gem
Add precompiled assets for heroku
change css
Merge branch 'v0.2'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss

	modified:   app/assets/stylesheets/default.css.scss
	modified:   app/views/pages/show.html.erb
	new file:   public/assets/404-2c81e29839d1aac38f455e174fa41969.jpg
	new file:   public/assets/application-aedecb3441c82d26f3de89034f24c98f.js
	new file:   public/assets/application-aedecb3441c82d26f3de89034f24c98f.js.gz
	new file:   public/assets/application-d1b3d967fcd0153e11342a5e3dacc98c.css
	new file:   public/assets/application-d1b3d967fcd0153e11342a5e3dacc98c.css.gz
	new file:   public/assets/manifest-37b7742becc47efb4b821651adb30eba.json
Add precompiled assets for Heroku