final project as of 11/11/2014
Merge remote-tracking branch 'origin/master'