Merge pull request #1 from benhalverson/master

bootstrap added
JQuery functionality added
Merge
Fixed errors after merge
combined jQuery with real data
Merge pull request #2 from benhalverson/master

added input field
patch merge
final merge patch
update