Edit
Merge branch 'master' of https://github.com/BlackTears/dark-beer

Conflicts:
	mixins/_mixins.scss
	mixins/css3/_transition.scss
	mixins/typography/list.scss
	mixins/variables.scss
	stylesheets/reset-global.scss