Første gang
Merge remote-tracking branch 'origin/master'

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