changes
changes
Merge branch 'master' of https://github.com/hugomarin/BuildsSnappy

Conflicts:
	stylesheets/style.css