Commented and cleaned up some code
Merge branch 'dev' of https://github.com/Bosch1337/BestWebapp4eva into dev