rm *.pyc
rm *.pyc
removed .idea
removed *.pyc
created views.py and edited urls.py
Merge branch 'bdbranch' of github.com:bdxhosting/laurendennishair into scot
Conflicts:
	.gitignore
sds