Merge branch 'jordan' into luke-work-branch

Conflicts:
	iuvo/iuvo_app/admin.py
	iuvo/iuvo_app/models.py
	iuvo/iuvo_app/templates/create_contact.html
	iuvo/iuvo_app/views.py
take care of conflict
resolving conflicts

resolve conflicts, add information, add needed templates, add our
custom css (needs to be added to settings file)
make changes to jordan's templates
update with changes
changing base template
updating templates
lovely navbar

Should be a working navbar
clean up navbar
reorganize into templates/iuvo_app
explanatory note

include jordan’s change to models.py
file cleanup. start on user home template.

get rid of my files that are redundant to Jordan’s.
create template file for user home.
update homepage

Hopefully change homepage layout to jumbotron with three columns below
it.
update homepage, start on user_home

homepage will have jumbotron with three column explanation below.
user_home to start. will use ajax to load in display div.
template fixes
update templates
moving things around
icon fix
another icon fix
merge my templates