added index.html.haml
fixed conflicts
Merge pull request #11 from Mathdrquinn/master

added css classes and added to userHome angular template
moved files into pipeline
fixed conflict
Merge pull request #1 from lizkline91/master

pushed files into pipeline