Merge pull request #6 from itsasquare/master

downstream merge of latest
#7 As a Visitor I want to add a player to my team
add team matrix object
fix conflict & convert to haml
change file type to haml