synkar
cd
Merge branch 'master' of https://github.com/rasmusolofzon/Piaette.git

Conflicts:
	piaette/.gitignore