Added Nav Header, Changed colors on form, added boilerplate for form
Added Nav Header, Changed colors on form, added boilerplate for form, Resolved Conflicts