Change gitignore
Add database.yml
Update styles
Merge branch 'master' of github.com:simutin/roll_up into simutin-master

Conflicts:
	app/assets/stylesheets/pages.css.scss
	app/views/shared/_header.html.erb