Site
Merge branch 'master' of https://github.com/le-hulk/Appixel

Conflicts:
	Site/site_appixel_layout.png