Merge pull request #1 from ChrisArcand/dev

Added form frontend