Added Profile Page for Phone#
Merge branch 'youser'

Conflicts:
	pushups/settings.py
	pushups/urls.py
Merge branch 'master' of https://github.com/waypaver/pushups

Conflicts:
	pushups/settings.py
split out common page elements to base.html made index extend it
minor changes
Merge pull request #37 from waypaver/creating-templates

Created Base Template
merging