Added a cool new button
Merge branch 'master' into myWork
Made a few changes to CSS and user_input.js
Merge branch 'myWork'