added changes
Merge branch 'master' into stylebranch
Merge branch 'master' into stylebranch
have rspec running
merge conflicts
Merge pull request #32 from paulhyunkim/stylebranch

Stylebranch