Merge pull request #19 from ChristianMurphy/develop

sprint 1
Merge pull request #22 from beccannlittle/develop

three js stuff
adding pep 8 as styleguide
Merge pull request #23 from beccannlittle/develop

cleared threejs stuffs of the nyan
Delete index.html~
adding gedit temp files to be ignored
fixed coding style of nav template
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
teacher page design heavily being implemented, mostly getting a wireframe out then will go back and optimize. Currently added the a new content page for each tab and the beginnings of profile tab content. Setup our static css/js files and locations through django. new template called modal that takes in title and content.
Merge pull request #31 from BrandonSleater/develop

Teacher page updates
adding security policies
Merge pull request #32 from ChristianMurphy/content-security-policy

adding security policies
updating style section

w3c nu is a validator not a styleguide
Merge pull request #33 from ChristianMurphy/readme-update

updating style section
First step of minigame pages
Merge branch 'develop' of https://github.com/ChristianMurphy/gateway into develop
initial minigame pages accessible by /minigames/aha etc