meh
fixed merge conflict
this stuff is not mine
I made the main layout for our app yay
Merge pull request #9 from elyselturner/infoPageLayout

Info page layout
Merge remote-tracking branch 'upstream/master'