added .git ignore, removed .pyc and .db files from repo
.gitignoare
.gitignoare
editing .gitignore
housekeeping
rm -r .idea/
Merge branch 'scott' of github.com:bdxhosting/laurendennishair

Conflicts:
	.idea/workspace.xml
removed .idea
m
Merge branch 'bdbranch' of github.com:bdxhosting/laurendennishair

Conflicts:
	.gitignore
editing index.html to match scott branch
editing index.html
editing index.html
editing base.html
editing base.html
m
m