removing app.js funzies
merge conflicts
Completed front end forms