Added models, controllers, tweet steps
Added the team steps
Finished the step definitions
Sorted out merges