Added keypad (currently commented out) - Mark & Sami

Fix attempt for 500 error issue - Mark
Merge branch 'master' of https://github.com/ssquare27/museum_guide
Merge branch 'master' of https://github.com/ssquare27/museum_guide