first commit
empty commit
dot
Merge branch 'master' of https://github.com/auction-team/auction-startup

Conflicts:
	index.html
first