Initial commit
Initial commit
Merge branch 'gh-pages' of https://github.com/frukan/mypage into gh-pages

Conflicts:
	index.html
merged