Merge pull request #96 from jamesongamble/master

Adds all students minus Liam and Alex
Adds active property to all users