Correct repos
Assets
Improving design
Merge branch 'master' into gh-pages

Conflicts:
	tpl/HomeView.html