going through old exercises
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
finally commiting
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Merge branch 'SL' of github.com:davincicoders/2013-q2-rails-1 into SL
Finished 299, got it working.