Merge pull request #29 from JeffScaturro/AdamFrontend

Adam frontend
Got the first homepage test working.
Merge pull request #30 from JeffScaturro/ScottFunctionalTest

Got the first homepage test working.
Functional login tests working.
Merge pull request #31 from JeffScaturro/ScottFunctionalTest

Functional login tests working.
Attempt to get travis running functional tests.
Merge pull request #32 from JeffScaturro/JeffFunctional

travis running functional tests.
Ammend to one commit, cleaner, and less clutter.
Merge pull request #33 from JeffScaturro/ScottFunctionalTest

Travis now makes sure the display initializes before starting Selenium t...
Login functional testing
Merge pull request #34 from JeffScaturro/ScottFunctionalTest

Login functional testing
Merge branch 'master' of https://github.com/JeffScaturro/EventPro into AdamFrontend

Conflicts:
	app/views/events/index.html.erb