cucumber setup
remove credentials from database example
Merge branch 'master' of github.com:itsasquare/fsb-proto
Merge branch 'master' of github.com:itsasquare/fsb-proto
auto test fix and remove helper spec test files
add basic structure for layout
Squashed commit of the following:

commit 838604e48d88ecd2430ab2ba37568d4956cbd3cc
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Thu May 16 00:09:17 2013 -0400

    Adding precious lines

commit 870922bf624c553efdc7cf966df328dbdb28d43f
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Thu May 16 00:05:31 2013 -0400

    Adding player and team impl. for view + tests.

commit 28941f4305e7de90f72852ed8e6aef5c2acec6e5
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 23:04:32 2013 -0400

    Adding player and team models

commit 5518acdbb8ed6696eadd16b583bfccb826b3dd9e
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 20:56:59 2013 -0400

    Adding more tests

commit 65b5b386c4433ba7d0aa3efed31f48ee13f57c7c
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 20:41:25 2013 -0400

    Adding player position model.. hardcoded for now

commit 9399bf280f4ce36fd55b1d170071a69a1b0e8b88
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 20:16:39 2013 -0400

    Adding controller

commit d5fc63217afb0f82a295401365c2920af1c7214c
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:57:08 2013 -0400

    Updating urls so they contain the player position instead

commit 55823257c653bfdb9031cbb4a6ad934d9fd1297b
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:56:40 2013 -0400

    oops wrong url name :)

commit 099fd2c4f54cdb3ffdd8861fb975e383d6fc2463
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:34:29 2013 -0400

    Another test we dont need

commit ec43825ca3a1b0ff066fd732e463e1d3c3fec9da
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:33:44 2013 -0400

    removing test for helper that we dont need

commit d7ac8aa391b9f715bc7b5c682105b8f31e4b6e62
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:32:43 2013 -0400

    Heed my warning or suffer the consequences

commit e9bc7b4836aa69d02f07c1d39b8d12c2771a6ff6
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:30:19 2013 -0400

    Tests for correct links now passing

commit 63b0c970045a6d1faaca9ddf947d7f0b2be825fa
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:29:48 2013 -0400

    Adding test for correct links

commit dc49522cbe5f15b81203a99ec4014d1a9e908f50
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 18:53:02 2013 -0400

    Adding high level spec for pick player page
Squashed commit of the following:

commit 838604e48d88ecd2430ab2ba37568d4956cbd3cc
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Thu May 16 00:09:17 2013 -0400

    Adding precious lines

commit 870922bf624c553efdc7cf966df328dbdb28d43f
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Thu May 16 00:05:31 2013 -0400

    Adding player and team impl. for view + tests.

commit 28941f4305e7de90f72852ed8e6aef5c2acec6e5
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 23:04:32 2013 -0400

    Adding player and team models

commit 5518acdbb8ed6696eadd16b583bfccb826b3dd9e
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 20:56:59 2013 -0400

    Adding more tests

commit 65b5b386c4433ba7d0aa3efed31f48ee13f57c7c
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 20:41:25 2013 -0400

    Adding player position model.. hardcoded for now

commit 9399bf280f4ce36fd55b1d170071a69a1b0e8b88
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 20:16:39 2013 -0400

    Adding controller

commit d5fc63217afb0f82a295401365c2920af1c7214c
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:57:08 2013 -0400

    Updating urls so they contain the player position instead

commit 55823257c653bfdb9031cbb4a6ad934d9fd1297b
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:56:40 2013 -0400

    oops wrong url name :)

commit 099fd2c4f54cdb3ffdd8861fb975e383d6fc2463
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:34:29 2013 -0400

    Another test we dont need

commit ec43825ca3a1b0ff066fd732e463e1d3c3fec9da
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:33:44 2013 -0400

    removing test for helper that we dont need

commit d7ac8aa391b9f715bc7b5c682105b8f31e4b6e62
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:32:43 2013 -0400

    Heed my warning or suffer the consequences

commit e9bc7b4836aa69d02f07c1d39b8d12c2771a6ff6
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:30:19 2013 -0400

    Tests for correct links now passing

commit 63b0c970045a6d1faaca9ddf947d7f0b2be825fa
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 19:29:48 2013 -0400

    Adding test for correct links

commit dc49522cbe5f15b81203a99ec4014d1a9e908f50
Author: Christian Toivola <c.toivola@gmail.com>
Date:   Wed May 15 18:53:02 2013 -0400

    Adding high level spec for pick player page
add compass
remove whitespace from team spec
add sass import structure
not sure why al this happend
Merge branch 'master' of github.com:itsasquare/fsb-proto
add files to gitignore
add guard live reload and create navbar partial
ripped out all style things and started from scratch, was having a lot of issues with compass config, needed to rebuild it
finally got compass working!!!!!!
basic application container
front end main container and home
Merge branch 'global-ui'

Conflicts:
	.gitignore
	spec/models/team_spec.rb