add
Merge branch 'master' of https://github.com/Krazylee/nox

Conflicts:
	nox/phidias/phidias.py
merger
Merge pull request #22 from ryaninhust/master

random