This is testing the merge comment stuff
another friggin test
Format for Add New form finished sans the buttons
I don't know why I'm doing this
Merged chris and shane branch