Characters now appear in interior views
Merge branch 'master' of https://github.com/zsweedyk/CS121F14S3_Team3
merged and added file
resolved merge conflict
fixed spacing issue
Merge branch 'master' of https://github.com/zsweedyk/CS121F14S3_Team3