crap!
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman into DatabaseConnection

Conflicts:
	.DS_Store
Var að gera print fyrir connections
Merge pull request #7 from Fanneyyy/DatabaseConnection

Database connection
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman into printfix
Printfix