initial update
Merge branch 'master' of https://github.com/GaZ3ll3/trivial