created repository for personal website
resolving git conflicts