commit
color
2
add .gitignore
.gitignoare
editing .gitignore
gitignore
housekeeping
rm -r .idea/
Merge branch 'scott' of github.com:bdxhosting/laurendennishair

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