Merge pull request #2 from pmcote/template

Incorporating bootstrap
First commit
Started on the results page. Also had to make some changes to the server and the layout to accomidate css stylesheet things.
Merge pull request #4 from pmcote/template

Bootstrap, and nav changes
Merge pull request #3 from pmcote/result-page

First commit
I made some changes that should be pulled
Merge pull request #5 from pmcote/pc-login

I made some changes that should be pulled
Finished adding all elements. Did rudimentary layout style stuff.
Merge pull request #6 from pmcote/result-page

Finished adding all elements. Did rudimentary layout style stuff.
Fixed the top margin cheat thing. Also re added the content block
Merge pull request #7 from pmcote/result-page

Fixed the top margin cheat thing. Also re added the content block
Adding navigation bar