vincents first commit
adding the .gitattr and .gitignore to tracked
Merge branch 'master' of https://github.com/marcoazn89/ZEMA

Conflicts:
	newView.php