Merge pull request #1 from jakejuby/master

pull on it dave
started work
done for the night
changes
input started
Merge remote-tracking branch 'upstream/master'

Bringing in the Dave's Code
cleaning up navigation