add branch feature_resource
new feature add resource
add branch feature_resource
new feature add resource
update gitignore
fix conflict
add everything
add everything
change gitignore
Merge branch 'feature_resource'

Conflicts:
	.gitignore