Initial commit
Revert "Initial commit"

This reverts commit 51ef8118d2eb396fd1786eda520feef316a41a1e.
Revert "Revert "Initial commit""

This reverts commit ddffd27c1cc1cf19d1765b46a5fe16f0a01b4e34.
add file
Merge branch 'master' of https://github.com/HaoVan/devmagento

Conflicts:
	.gitignore