Merge pull request #41 from agundy/develop

Pull Develop into Master
Used right variable name
Merge pull request #45 from agundy/develop

Develop
Removed conflicting data from initial_data
Fixed 404 error on add assignment
Updated show_dashboard to fix endless 404s on admin login
Got adding weights working right again
merge conflicts. *crying*
Fixed make command in README
Updated Readme with server link
Fixed gitignore to ignore WhiteboardDB
Updated gitignore for test database
Merge pull request #47 from agundy/hotfix

Hotfix
Merge pull request #48 from agundy/master

Pulling fast updates from master into dev