Merge pull request #4 from callapatel/callap

Callap
start rspec
start rspec
fix merge
Merge pull request #5 from callapatel/rspec

Rspec
add basic rspec for models/controllers
Merge branch 'master' into rspec
made omniauth twitter happen
Merge branch 'master' into callap
Merge pull request #6 from callapatel/rspec

Rspec
merge fix