Finished new tab form
Finished new tab form
Fixed merge
Merge pull request #6 from walterm/katie

new tab form!