Merging with future commits
Changed JS src locs in Join.html
Merge branch 'master' of https://github.com/ZacharyThomas/RPIpickems
Merge branch 'master' of https://github.com/ZacharyThomas/RPIpickems