School stuff
Merge branch 'master' of github.com:JohnBurchell/Current
Merge branch 'master' of github.com:JohnBurchell/Current
Changes made