Initial commit
Merge branch 'master' of https://github.com/eminhalimovic/mysite

Conflicts:
	.gitignore
	LICENSE