Updated a bunch of stuff
Merging. I can't believe I was stupid enough to forget to pull first before doing a huge update
fixed some url parsing issues
Updating to new template version
updated with new resume and resume link
changed facebook link to twitter
Merge branch 'master' of github.com:marcusball/marcusball.me