#1 Initialize Laravel and Git Repo, Hello?!
Merge branch 'master' of https://github.com/diegomrodz/impact

Conflicts:
	.gitignore