2
add .gitignore
gitignore
Merge branch 'scott' of github.com:bdxhosting/laurendennishair

Conflicts:
	.idea/workspace.xml