pushing changes for Dana
pushing for merge
Removed .DS_Store files
ignore .DS_Store files
Merge branch 'form-styling'

Conflicts:
	server.js
Merge branch 'master' of https://github.com/rperryng/ExperienceTO into AngularFileUpload

Conflicts:
	server/components/signup_business/signup_business.hbs