Merge branch 'release/first_models_and_ui' into develop
added basic favicon and robots.txt
Merge branch 'hotfix/fix_navbar_collapse' into develop

Conflicts:
	emrapp/templates/main/base.html
commit .txt file (Test)
I sure hope this is it
Merge branch 'develop' of https://franklin.unfuddle.com/git/franklin_f14emrgit/ into develop
updated Chris' and Tish.txt
Updated objects on views
Should be deleted
Made changes to views extra objects, used arguments from models.py
Last update before push, few minor changes
refactored to take out the dashboard object (there is no dashboard object)
Created initial patient login page.
Changed page title.
authentication connections and tweaks, working on 'bootstrapped' login
admin page updates to use the right Patient table for authentication
Merge branch 'feature/edit_login_with_bootstrap' into develop
minor bug fixed -> patients could gain access to other patients info
missed this change in last commit for patient access bugfix
pruning of repository and code design changes discussed in meeting
Tuesday night, customized the login for admins