upate web
Merge branch 'master' of github.com:mavry/mavry.github.io

Conflicts:
	assets/stylesheets/application.css
	index.html