accidently overwrote package.json
added controller file to js directory
added .gitignore
deleted unneccessary files
Merge branch 'testing'
fixing shit