First commit
Merge branch 'master' of https://github.com/doemijnina/portfolio

Conflicts:
	.gitignore