Data Encapsulation :)
Merge branch 'master' of git://github.com/JeffTolbert/612-2013 into jeff
Fixed Jeff's merge