Initial setup with minimal confit only: Home, Alterations, About
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
some commit
Merge branch 'master' of github.com:travelhu/budapest-tailor