Initial commit
HTML Template
Merge branch 'master' of github.com:barta3/ch.bfh.bti7054.w2013.p.FashionShop

Conflicts:
	.gitignore
html