add .idea to .gitignore
oops - here's where to actually remove .idea from .gitignore
Merge branch 'master' of github.com:jcbeaury/britt-shoes

Conflicts:
	.gitignore