Merge pull request #1 from eacarter/master

added setup files
Merge pull request #2 from eacarter/master

setfiles
parse
Merge branch 'master' of https://github.com/itoxygen/MPS
added parse files
Merge pull request #3 from Klark-El/master

added parse files
Fixed the Merge conflict
fixed one issue
filled content card and switched imageview/imagebuttons
Merge pull request #5 from Klark-El/master

filled content card and switched imageview/imagebuttons
changing pictures
fixed broken if statement and changed image sizes
Merge pull request #6 from Klark-El/master

changing pictures
pull to refresh
we altered time stamp
Merge pull request #7 from Klark-El/master

we altered time stamp
Added dialog window