Update index.html
Minor changes to folder name
Make minor changes to revert
Merge branch 'master' of https://github.com/combizs/angular
Merge branch 'controller' of https://github.com/combizs/angular into controller

Conflicts:
	egg-tutorial/index.html
Fix original html
Create Controller in main.js and assign message in data

Add controller in application and link script for controller
Fixed error: changed function name
Changed message value from controller
Add new content to test the 'dot' behavior
Add comment to explain parent > children scope and the binding that changes all from any input
Moved main.js towards bottom of page; must load after angular script is declared

Created 'myApp' service to share controller data and binding, rather than declare parent scope within index.html
Added 'reverseString()' to 'SecondCtrl'
Refactored code in 'index.html' and 'main.js' for 'reverseString()' code to be simple
Merge branch 'filter'

Conflicts:
	egg-tutorial/index.html