have a modal box working
push final to server
Merge branch 'master' of https://github.com/moog16/personalSite

Conflicts:
	js/main.js