updates merging the 2 code bases
Merge branch 'master' of https://github.com/NYCCSC/nyccsc-rails