Adding all the files to git
added files to git
Merge branch 'master' of https://github.com/feaf/arfea

Conflicts:
	index.php