add secure password to user model
initial homepage view
create get_user method for use on homepage
update homepage to display created by: creator name
add _header and _footer files
rearranged routes for new user and login user, also implemented login_logic to display at top of home page
added signup form with additional information
Merge pull request #16 from jpberry0623/john

add questions with ajax, add/rename survey routes
added display for inidividual survey
added survey results page
added survey results page
fixed merge conflicts
add stats and surveys created (not taken) to user profile
add bcrypt to gem file, and password authenticate
fix routing for new user signup, add bcrypt for password
add end to block in index to get rid of conflict
Merge branch 'rootul-anthony'
merging rootul-anthony work on survey routes and results to master
Merge branch 'master' into alan

add master to alan to test for merge conflicts
delete phantom end from controller
Merge branch 'alan'

add alans branch, no apparent conflicts