Style changes
Merge branch 'master' of github.com:MyXoToD/myxotod.github.io

Conflicts:
	assets/stylesheets/application.css
	assets/stylesheets/application.scss
	assets/stylesheets/media-queries.css