Merge branch 'master' of git://github.com/eregs/regulations-site
Fix template broken in merge
Merge branch 'master' of git://github.com/eregs/regulations-site
Merge pull request #97 from cmc333333/master

Hotfix for template issue