Initial commit
Resolved conflicted files
Merge branch 'development'

Conflicts:
	README.md
Deleted the credentials from index
Merge branch 'clean-up' into development