Adding basic styles
Merge branch 'basic-css'

Conflicts:
	public/stylesheets/app.css
	public/stylesheets/app.css.map