Protractor symlinks because I cant put it in the PATH and we are too lazy for our own good
Merge branch 'james_branch_2' into dev
Merge branch 'dev' of github.com:c1moore/cen3031project into dev