added fade in and out

Description still needs work
Merge branch 'master' of https://github.com/dsteiner93/dsteiner93.github.io

Conflicts:
	style.css