Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	.gitignore
Normalize line endings
Re-arranging entries into mostly (loosely) alphabetical order.
The only change was changing "idea" to ".idea" to exclude WebStorm IDE projects that use the ".idea" directory.
Re-arranging entries into mostly (loosely) alphabetical order.
The only change was changing "idea" to ".idea" to exclude WebStorm IDE projects that use the ".idea" directory.
git rid of gitignore files
git rid of gitignore files
git rid of gitignore files
git rid of gitignore files
git rid of gitignore files
git rid of gitignore files
git rid of gitignore files
git rid of gitignore files
git rid of gitignore files
Merge pull request #170 from blaine-O/master

.gitignore- Re-arranging entries into mostly (loosely) alphabetical order