Convert most of the view to haml/markdown
Merge branch 'master' of github.com:muziejus/simple-sinatra-homepage

Conflicts:
	views/about.erb
	views/academics.erb
Merge with post MLA touch up