Revert 8f65f93..15fcadb

This rolls back to commit 8f65f93a622f9267b9300d597e58b10bb7bb3219.
revert
Merge branch 'master' of https://github.com/papsx/portfolio-2014

Conflicts:
	css/style.css
	scss/style.scss