not even sure
got rid of HAML files
merged
Merge branch 'master' of github.com:pmichaeljones/playground