first commit
Merge https://github.com/ifried01/ifried01.github.com
first commit