fixes
Merge branch 'master' of https://github.com/designerLightmedia/tyco

Conflicts:
	assets/css/style.css