jovuvu/SoftwareEng-FinalProject — pull request #4 by dillondrenzek (2014-03-07 23:49:53+00:00)
Title: Switch to haml

I've finished the switch to haml files, 'rails server' works, but it says I can't merge the branches