Merge pull request #12 from ChristianMurphy/develop

updating master with latest stable
Merge branch 'master' of https://github.com/ChristianMurphy/gateway into develop
Merge pull request #17 from JoeStratton/develop

git pull update
Merge branch 'develop' of https://github.com/ChristianMurphy/gateway into develop
Need init in gateway folder or it won't recognize it as a module. Pretty bad I didn't notice this
Merge pull request #18 from BrandonSleater/develop

bug on app folder
fix urls
updating bootstrap mixins naming
fixing media-glyphicon references
Merge pull request #20 from ChristianMurphy/bootstrap-mixins-naming

Bootstrap mixins naming
teacher page, added urls in, beginning template
ci fail
teacher.py now passing pep8
Merge pull request #21 from BrandonSleater/develop

Teacher-Admin page
three js stuff
becca is awesome
Merge pull request #22 from beccannlittle/develop

three js stuff
adding pep 8 as styleguide
cleared threejs stuffs of the nyan
love, becca
Merge pull request #23 from beccannlittle/develop

cleared threejs stuffs of the nyan
Delete index.html~