rails assets gem
fixed for smaller screens
ignoring DS_store

Signed-off-by: Danielle Bakhazi <danielle.bakhazi@gmail.com>
Merge branch 'master' of heroku.com:tryst-av

Signed-off-by: Danielle Bakhazi <danielle.bakhazi@gmail.com>

Conflicts:
	app/assets/stylesheets/application.css.scss