123
Merge remote-tracking branch 'origin/master'

Conflicts:
Merge branch 'master' of https://github.com/RamonValk/GritCollege