Oct20-13
10-24-13
oct 26
10-25-13
10-28-13-Laptop
Lots of new functionality
Merge remote-tracking branch 'origin/master'