Initial commit
Merge branch 'dev'
git ignore
required libraries
Merge branch 'dev'

Conflicts:
	.gitignore
Merge branch 'master'