add nothing
change views/template views/article/index view article/_form controller/article
add ignore file

ignore backup files and log directories
Merge branch 'master' of https://github.com/Tomimaru/DMTC-teamF

Conflicts:
	fuel/app/views/article/view.php