20141128_02:56:16
Merge branch 'master' of https://github.com/Nymphium/works

Conflicts:
	ShellScript/gituploader