Merge branch 'release/3_Real_App' into develop
Merge branch 'hotfix/jsruntime' into develop
Merge branch 'develop' of github.com:flowerett/ticketee4 into develop
index action & factory_girl
Merge branch 'hotfix/UpdateRails' into develop
Merge branch 'hotfix/SyntaxFix' into develop
Merge branch 'hotfix/UpdateRuby' into develop
merge develop
update action
delete action
refactor projects
chapter notes
Merge pull request #2 from flowerett/feature/CRUD

CRUD
Merge branch 'master' of github.com:flowerett/ticketee4
Prepare for Heroku
update rails to 4.0.0.rc2
Merge branch 'hotfix/Rails4RC2'