Began working on site wireframes into HTML, deleted some messy angular code, added a ton of new items to the jBuilder file. Added Foundation library as a css grid framework.
Removed my CSS sheet. added text align center to the root page.
Fixing Merge crap.
Merge branch 'master' of https://github.com/badascii/Dotameter
Merge branch 'master' of https://github.com/badascii/Dotameter
Merge pull request #26 from Duder-onomy/master

YOUR MOMS MERGE
readded missing application.yml. renamed hero portrait directory.
Merge branch 'master' of https://github.com/badascii/Dotameter
added primary_stat to .rb and .json file
change primary_stat to str/agi/int
Merge pull request #27 from neilnorthrop/master

added primary_stat to .rb and .json file
Working on main listing page. Using Angular to manage and split data. Had to edit routes file.
Merge pull request #28 from Duder-onomy/master

Working on main listing page. Using Angular to manage and split data. Ha...
Merge branch 'master' of https://github.com/badascii/Dotameter