second commit
Merge branch 'master' of https://github.com/rbriese/Robert-Briese-Profile

Conflicts:
	README
changes to scripts.js