Data is now showing up, now to style it
Fixing merge conflicts
Merge pull request #4 from JParker85/master

Adding styling, rendering data