hey
Merge branch 'master' of github.com:itedi/ThumbsUp
Merge branch 'master' of github.com:itedi/ThumbsUp
Merge branch 'master' of github.com:itedi/ThumbsUp
Link
Merge branch 'master' of github.com:itedi/ThumbsUp

Conflicts:
	app/views/email.blade.php