Removed file that is no longer relevant
Altered wording, added protractor install option
protractor now asserts that the webpage is the correct one
Merge branch 'james_branch_2' into dev
changed a couple file names to better match what they do.  test.spec.js changed to page_loacing.spec.js and Conf.js -> conf.js.  page_loading now checks to make sure the pages are loading properly
fixed bugs in protractor test  page_loading.spec.test
Added the demo user and options in the populator interface
Added an event to be associated with the demo user
Merge branch 'dev' into devDan
Merge branch 'daltonbranch' into dev
Began writing the admin spec for protractor
Merge branch 'dev' of github.com:c1moore/cen3031project into dev
initial protractor leaderboard test started
Merge branch 'devDan' into dev
Got image upload to work, but they are not yet being saved to the server.
Merge branch 'c1moore_branch' into dev
Set overflow-x to hidden on all pages.
Added webdriver installation to setup script
Merge branch 'james_branch_2' into dev
Merge branch 'dev' of github.com:c1moore/cen3031project into dev