remove sass gem
whatever
Merge branch 'less'

Conflicts:
better less
update
cleanup
I have no idea what I'm doing
added social links
update
Merge branch 'refs/heads/sass'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.slim
needed bundle install
needed bundle install
added html previews on index
added pagination.
moved footer to separate file. better pagination.
extracted footer
removed unneeded _comment.html.haml file. Removed kaminari stuff, 
Merge branch 'refs/heads/mistakes'

Conflicts:
	app/views/admin/comments/DEP_comment.html.haml
	app/views/layouts/application.slim
	app/views/posts/_post.html.slim
sass problems
added sass-rails to Gemfile