updating tests
merging
merging
fixing git problems
updating tests and fixing build breaks
adding angular project for front end
merging dev branch
editing gitignore