NYU AD feature test
Empty push for Jenkins
Another empty push for jenkins.
Using this new test...
Storing location for location based tests
Add NYUSH feature test
Merge branch 'development' of github.com:NYULibraries/login into feature/nyush_login
Merge branch 'development' of github.com:NYULibraries/login into feature/nyuad_login
Merge branch 'development' of github.com:NYULibraries/login into feature/nyuad_login

Conflicts:
	features/step_definitions/logging_in_steps.rb
Merge branch 'development' of github.com:NYULibraries/login into feature/nyuad_login
Passing for nyuad
Merge branch 'development' of github.com:NYULibraries/login into feature/nyush_login

Conflicts:
	features/step_definitions/logging_in_steps.rb
Merge branch 'feature/nyuad_login' of github.com:NYULibraries/login into feature/nyush_login
Merge branch 'feature/nyuad_login' of github.com:NYULibraries/login into feature/nyush_login
NYUSH feature test passing
Merge branch 'development' of github.com:NYULibraries/login into feature/nyush_login
Merge branch 'development' of github.com:NYULibraries/login into feature/nyush_login
Merge branch 'development' of github.com:NYULibraries/login into feature/nyuad_login
Merge branch 'feature/nyush_login' into feature/nyuad_login
Merge pull request #6 from NYULibraries/feature/nyuad_login

Feature/nyuad login