it's telling me to
Merge branch 'master' of github.com:chevinbrown/tracker

Conflicts:
added pagination and fixed double render for submission