Josh made changes.
Merge branch 'lvhack14' of https://github.com/lehighvalleytech/lvhack into lvhack14