First test pic.
Merge branch 'master' of https://github.com/brandonaaskov/raspberry-pi
Updates.
Fixed merge conflict.
Fixed merge conflict.