Merge pull request #1 from tk-kowal/create-promotions

Create Promotions
Merge pull request #3 from tk-kowal/promotion-show

Show promotions and edit your own promotions
changed routes for oauth and the new modesl
omniauth setup
working oauth signin/signup
User view and some promo stuff

I made a user profile page. Also changed the promotion controller for the Create, because it wasn't associating the creation the a user. Also added a text_area instead of text_field.
fixed typo
fixed profile route
Merge pull request #2 from tk-kowal/oauth_signup

Changed routes for oauth and the new models
Merge branch 'twitter_monitor' into unit-testing

Conflicts:
	Gemfile.lock
fixing conflicts