hopefully?????
Merge branch 'gh-pages' of https://github.com/arrivance/webdevchal into gh-pages

Conflicts:
	assets/css/lvm.css
	assets/img/logo.png
	assets/img/news1.jpg
	assets/img/news2.jpg
	assets/img/news3.jpg
	assets/img/promo1.jpg
	assets/img/slide1.jpg
	assets/img/slide2.jpg
	index.html