Infobox Update

Git is working for me again!
This is basically a merge between the master branch and the Current
State branch.