trying to pull
Merge conflicts.
Merge branch 'master' of https://github.com/tan01/UDOO-PRNG