deleted holmes from master
Merge branch 'dev'
Merge branch 'dev'
removed input padding, added keyup/keypress handlers