remove DS_store
check-in after team model added
setup
check-in before slight cleanout
check-in before master merge
Merge branch 'master' of https://github.com/elliotte/WazaReport

Conflicts:
	app/controllers/teams_controller.rb
	app/models/team.rb
	app/models/user.rb
	app/views/reports/show.html.erb
	app/views/teams/index.html.erb
	app/views/welcome/index.html.erb
	config/routes.rb
	spec/factories/teams.rb
	spec/models/team_spec.rb
	spec/models/user_spec.rb
before clean out
check in before report refactor
tidy up started
tabs remove modal started
bit of clean out done and report show restructure
bit of rspec cleaning, routing controller marked out
check-in for G
added omniauth test
Ledgter feature implementation
Merge branch 'dev' of https://github.com/elliotte/WazaReport

Conflicts:
	app/views/shared/_baselayout.html.erb