test edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.md
Merge branch 'master' of https://github.com/BeautyNista/nista

Conflicts:
	readme.md