First Stage of URL Authentication
Resolve Merge Conflicts
Adding current dev team's info
Merge branch 'develop' of github.com:avaleske/SharkEyes into develop