factored the user application out a bit
factored the user application out a bit
Merge branch 'master' of github.com:PurdueHackers/hackathon
This is broken. Working on making form registration work
Fix merge conflicts