basic front page
resolve merge conflicts for welcome.js
Merge pull request #9 from rjbernaldo/basicindexpage

basic front page
Merge branch 'master' into styles_for_profile

Adds css for index page

Conflicts:
	app/assets/javascripts/welcome.js