added pointer/buffer validation
pulled and fixed conflicts
preparing to pull merged copy
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
prepping for pull
getting ready for pull
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
fixed pointer validator
preparing for pull
fixed merge conflicts