- refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	02AjaxBasic/.idea/workspace.xml
- edited general/index