categories landing
Merge branch 'master' of https://github.com/wyliethomas/teraflex

Conflicts:
	app/views/welcome/categories.html.erb