converted erbs to haml except for ed's index which is written like complete ass
Merge branch 'master' into switching_erbs_to_haml
SAFETY
Merge pull request #121 from red-admirals-2014/switching_erbs_to_haml

Switching erbs to haml