merged some of jesper's changes and added a test button
changed a bunch of UI stuff... moved navbar to index, added bootstrap default modifiers to index.css. Added modal code to main-controller.js. Hopefully I didn't forget too much.
added a bit more beautifying to the login page
merging master into workingModals
Merge pull request #34 from nfeliciano/workingModals

Works as intended. Lots of commented out code that will be cleaned up.