Ignore .DS_Store
Merge branch 'dev' of github.com:rodaine/See-The-Feed into dev

Conflicts:
	.gitignore
Fleshed out app structure and grunt tasks
Began config module