Merge pull request #18 from BrandonSleater/develop

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

Bootstrap mixins naming
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~
adding gedit temp files to be ignored
adding additional styleguides

as well as adding naming conventions
Merge pull request #24 from ChristianMurphy/pep-8

Styleguides and Naming convensions
Merge branch 'develop' of https://github.com/ChristianMurphy/gateway into develop
got stacked pills to work on teacher template. Also got the content to fade in for each pill to avoid having multiple pages. No one likes URLS ;O