2014-07-27
Merge branch 'master' of https://github.com/psytky03/Misc

Conflicts:
	README.md
Merge branch 'master' of https://github.com/psytky03/Misc

Conflicts:
	README.md