Demo 3 Template
Merge branch 'master' of https://github.com/LeeZhou/Capstone2013BBB