Temp commit for pull
Merge branch 'master' of https://github.com/martinehrenstein/iwillifyouwill
Stream
Merge branch 'master' of github.com:martinehrenstein/iwillifyouwill

Conflicts:
	models/user.rb
Merge branch 'master' of github.com:martinehrenstein/iwillifyouwill