Backup as of 7pm 11-19-2014
Merge pull request #5 from sandrowong/update7pm.11.19.14

Backup as of 7pm 11-19-2014