pushing changes for Dana
File uploads now work on back end
Merge branch 'master' of https://github.com/rperryng/ExperienceTO into AngularFileUpload

Conflicts:
	server.js
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
pushing final bus register page
Merge remote-tracking branch 'origin' into form-styling
Merge pull request #2 from rperryng/form-styling

pushing final bus register page
Landing Page
style changes
Merge branch 'form-styling' of https://github.com/rperryng/ExploreTO into form-styling

* 'form-styling' of https://github.com/rperryng/ExploreTO:
  pushing final bus register page
  ignore .DS_Store files
  Removed .DS_Store files
  pushing for merge
  Added class list view
  Modified ports for server deployment

Conflicts:
	.DS_Store
	client/assets/.DS_Store
	client/styles/theme.css
	server.js
Merge branch 'master' of https://github.com/rperryng/ExperienceTO
Remove DS_Store files
Corrected spelling mistake in gitignore for ignoring DS_Store files
Removed uploaded images...
removing max width on slider
fixing svg file