changes
Merge branch 'master' of https://github.com/jlemm45/PrintStash

Conflicts:
	wp-content/themes/printstash/img/load4.gif
	wp-content/themes/printstash/includes/display-user-uploads.php
uploading
Merge branch 'master' into dev_server