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

Conflicts:
	server.js