ruler
ruler 1 2 3
Merge branch 'master' of github.com:alonrk/shoutout

Conflicts:
	.bowerrc
	.gitignore
	app/index.vm
	app/scripts/app.js
	app/scripts/shoutoutApi.js
	app/styles/main.scss
	app/views/choose-template.haml
	app/views/complete.haml
	app/views/contacts.haml
	app/views/message.haml
	app/views/send.haml