Some new code and most likely some new bugs
Merge branch 'master' of github.com:HaGoijer/Site