git init
Merge branch 'master' of github.com:abancu/mysite

Conflicts:
	README.md