pulling master
resolved .ds
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/snippets

Conflicts:
	log/development.log