Update from user1
user1 add a
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
NEWNENWNEW
Merge branch 'master' of github.com:boo1ean/academy-git