first layout
Merge branch 'development' of https://github.com/danielrohers/techpartyfaccat into development

Conflicts:
	assets/css/style.css