Add choice page under welcome
Merge pull request #44 from esodov/add_choice_page

Add choice page under welcome
Fix front page.
Fix extensions JPG->jpg
Delete view test.
Merge branch 'fix_front_ui' of github.com:esodov/wassermann into fix_front_ui

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