Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Organized, added to gemfile
Made tournament active state editable
Upgraded rails to 4.1.4
Merge branch 'beta'
Merge branch 'beta'
Fixed merge?
Fixed merge again?
Merge branch 'master' into beta