primer commit
Merge branch 'master' of https://github.com/randyibarrola/active

Conflicts:
	.gitignore