stash commit
Merge branch 'master' of https://github.com/OskarHandmark/eitf05_iconshop
Merge branch 'master' of https://github.com/OskarHandmark/eitf05_iconshop
database.php without prepared statements