merge conflict solved
merge conflict solved

Cleggameg/house-rules-first-iteration,chi-sea-lions-2015/house-rules,Cleggameg/house-rules-first-iteration,chi-sea-lions-2015/house-rules,Cleggameg/house-rules-first-iteration,chi-sea-lions-2015/house-rules