update
Merge branch 'LA' of github.com:davincicoders/2013-q2-rails-1 into LA
asd;lfkj
Merge branch 'LA' of github.com:davincicoders/2013-q2-rails-1 into LA

Conflicts:
	284/284.rb