maj
Merge branch 'master' of https://github.com/tiregram/site2

Conflicts:
	.gitignore
	README.md
first