DELETED Files
Merge remote-tracking branch 'origin/begur'

Conflicts:
	scss/buttons.css
	scss/buttons.scss
	scss/links.css
	scss/links.scss
	scss/mixins.css
	scss/mixins.scss
	scss/style.css
	scss/style.scss
	scss/variables.css
	scss/variables.scss
DELETE!
Merge pull request #3 from xexiu/master

Merrg