committing
Merge branch 'master' of http://github.com/david-deboer/msip-2014
merging