hi
live
live
Merge remote-tracking branch 'origin' into gh-pages

Conflicts:
	app/sitemap.xml
Merge pull request #1 from WebRuin/gh-pages

Test