getting old home
Merge branch 'develop' of https://github.com/ChristianMurphy/gateway into develop
new options added
added new options page
added next optoins page
Set teacher url again
brought gateway.css back. removed/fixed anything that was originally overriding bootstrap
Setting up profile/teacher for demo
Modified next options controller
added options controller
got confused on teacher, fixed url issue
Update .gitignore

ignore .swo & .swp
removing swap files
Merge pull request #101 from BrandonSleater/develop

Demo Content: Profile/Teacher
test for options added
Merge pull request #99 from davisk/develop

added new options page
hooking up user data to profile. making profile generic to both teacher/student
Merge pull request #102 from BrandonSleater/develop

User profile data and DRY on profile for teacher/student
pep8 fixes
Merge pull request #103 from ChristianMurphy/develop

pep8 fixes