add haml
Merge branch 'add_haml_gem'
add omniauth-twitter gem
add twitter credentials file
store player id on session
add dashboard and session controllers
use find_or_create_by_twitter_id generated by rails
add bootstrap js, css and images
Merge pull request #3 from Moove-it/add_bootstrap_files

Add bootstrap files
Merge pull request #2 from Moove-it/add_models

Add models
Merge branch 'master' into add_omniauth_gem

Conflicts:
	app/models/player.rb
Merge pull request #1 from Moove-it/add_omniauth_gem

Add omniauth gem for twitter connection
refactor code and create team model
Merge pull request #4 from Moove-it/add_models

refactor code and create team model
added players and companies controllers
Merge pull request #6 from Moove-it/consumer_site

added players and companies controllers
Merge branch 'master' into add_backbone

Conflicts:
	Gemfile
	Gemfile.lock
move bootstrap files to vendors folder