Merge branch 'master' of github.com:coreyd303/feed_engine_ember into bootstrap

Conflicts:
	app/templates/application.hbs
remove 'demo' links
Merge branch 'bootstrap' of github.com:coreyd303/feed_engine_ember into bootstrap
Add Instagram
adds bootstrap
Merge branch 'bootstrap' of github.com:coreyd303/feed_engine_ember into instagram
fixed closing div for index page
Put 'outlet' in 'container' in application.hbs.
switch instas to thumbnail size
Merge branch 'bootstrap' of github.com:coreyd303/feed_engine_ember into instagram
adds styling
Add index.hbs
Iteration 0 of index is done. Onn to trip planning
changed user ember data model, omniauth-twitter signin works
Done with Trip Create page
Removed groups from router.js
Removed app/models/group.js
Removed app/routes/groups/js
Removed app/routes/
Removed app/templates/groups/
Modified app/templates/application.hbs to remove 'groups' link
Modified app/models/trip.js to set up new many-to-many association with users
Modified app/models/user.js to set up new many-to-many association with
trips and swich from first_name last_name to name
Merge branch 'twitter' of github.com:coreyd303/feed_engine_ember into remove-group

Conflicts:
	app/styles/app.scss
	app/templates/application.hbs
	app/templates/groups/index.hbs
Merge pull request #26 from coreyd303/remove-group

Remove group