fixed merging
Merge branch 'gh-pages' of github.com:lapty/resume into gh-pages