Merge branch 'working'
working_2 branch
Merge branch 'working_2'
added segment
Merge branch 'working_2'
added spin and removed console bugs
Merge branch 'working_2'
hello
Merge branch 'master' of https://github.com/hughhopkins/dog

Conflicts:
	.meteor/packages
	client/main.html
	client/main.js
	client/views/application/layout.html
	client/views/posts/post_item.html
	smart.json
	smart.lock