blah
Merge branch 'master' of https://github.com/mikewgd/mikewgd

* 'master' of https://github.com/mikewgd/mikewgd:
  - added in image and text module -working on homepage

Conflicts:
	css/pages/home.min.css
	css/styles.min.css