Removed .DS_store from git.
new build.
Merge branch 'gh-pages' of https://github.com/tonyonodi/angular-potato into gh-pages

Conflicts:
	scripts/scripts.ca9e8c37.js