Branch merge and adding templates.
Merge branch 'master' of github.com:erykpiast/LiveBackground