Merge pull request #2 from guymann/master

Style sheet changes, removed /.DS_Store
Fix slideshow css
Merge pull request #3 from josephbisch/slideshow

Fix slideshow css
Merge github.com:ieeeunh/ieeeunh.github.com

Conflicts:
	css/style.css
	css/style.less