Added and changed some stuff I don't remember
Merge branch 'master' of https://github.com/DuXeN0N/LaradeRepo