post project presentation, pre pull commit.
Merge branch 'master' of heroku.com:leafthru

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/welcome.css.scss
	app/views/layouts/_nav.html.erb
Added link to personal site 'paulgasbarra.com' to 'about' page, installed barometer gem and added forecast funtion to nav bar. Temperature now adjusts in realtime.
two more files
pulled and merged files