tiles and actions
Merge branch 'master' of https://github.com/cisbjmaclean/CIS2232_Fall20142015