fixed haml
Merge branch 'master' of https://github.com/JamesRottinger/FR_office_sports
pre compile
Merge branch 'master' of https://github.com/JamesRottinger/FR_office_sports
pop up forms
Merge branch 'master' of https://github.com/JamesRottinger/FR_office_sports