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
merge
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
many script errors reordered angualr files into the assest pipeline and fixed css reference errors
Merge pull request #13 from Mathdrquinn/master

I'm the best, with 18 errors
relocated angualr and bootsrap files to fix errors in the console and I feel much beter for doing this
fixed 1 error :)
messed with asset pipeline
merge fix
Merge pull request #14 from Mathdrquinn/master

relocated angualr and bootsrap files to fix errors in the console and I ...
joined modules
ive done nothing
Merge pull request #15 from Mathdrquinn/master

joined modules from 2 to 1
added gitignore and fixed merge errors