Merge pull request #3 from BusProject/master

Deployed Master to Production
fix block order