Clean up angular code
Include demo.html
merges branches
merges car