stuff
Merge branch 'master' into jack
nothing
Merge branch 'master' into biggs
Merge branch 'master' into biggs
redirect to login instead
Merge branch 'master' into biggs
some
stuff
Merge pull request #22 from stuycs-ml7-projects/steven

Steven
kill and penalize?
Merge branch 'master' into biggs
got rid of log
changes
Merge branch 'jack'
stylin