merge conflict resolve
Merge branch 'master' of github.com:maneeshnycda/kanye
Merge branch 'master' of github.com:maneeshnycda/kanye

Conflicts:
	css/style.css
Merge branch 'master' of github.com:maneeshnycda/kanye
merge conflict resolved
Merge branch 'master' of github.com:maneeshnycda/kanye
Merge branch 'master' of github.com:maneeshnycda/kanye
Box-shadow and transition on circle elements
merge conflict resolve