Merge pull request #2 from joelzyla/gh-pages

pull
commiting again because git is horrible
Merge branch 'master' of github.com:joelzyla/FSU
commit