drasl
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman

Conflicts:
	.DS_Store
villuskilabod i database
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman
restin