Now handles tab input
Merge branch 'master' of https://github.com/qog314/prog3