commits files to master
Merge pull request #5 from bwstud/master

Brian & LiLi Platform Features Exercise