.gitignore is now working
Merge branch 'master' of github.com:limtrack/urban
creating folder for uploaded images
update gitignore
wp-config
Merge branch 'master' of github.com:limtrack/urban

Conflicts:
	wp-config.php