Fixing undefined prop err
Merge branch 'master' of github.com:JoshuaDickerson/hackvt-2014