save style.sass
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt

Conflicts:
	app/sass/style.sass
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
added .DS_Store to .gitignore
merged sass
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt

Conflicts:
	.gitignore
merge app/img/sample_sale.png
app/js/templates/results_map.html
app/sass/_mixin/icon-styles-mixin.scss
app/user_form.html
re-resolve merge conflicts
Merge pull request #44 from wentingrohwer/master

merged files