Initial commit
Resolving conflicts
Merge branch 'master' of https://github.com/victorrodrigues/codeigniter_bootstrap_project

Conflicts:
	.gitignore
	README.md