some brpoken code
Merge branch 'master' of github.com:vtsatskin/Icebreaker

Conflicts:
	models/user.rb
awesome slideshow shit
Merge branch 'master' of github.com:vtsatskin/Icebreaker

Conflicts:
	models/user.rb