commit lingering changes
added to urls.py and views.py
commit 1, 2014-11-16
views, customuser,  etc..
conflicts resolved