added index.html.haml
fixed conflicts
moved files into pipeline
fixed conflict
Merge pull request #1 from lizkline91/master

pushed files into pipeline
Merge pull request #12 from Mathdrquinn/master

Liz's commits