changed dir from image to images.
Merge branch 'myinventory' of github.com:jmophoto/myinventory into myinventory
Merge pull request #1 from jmophoto/myinventory

Changed to save to images directory
change to deploy from master.
Merge branch 'master' of github.com:jmophoto/myinventory
more front end
Merge pull request #2 from thogg4/front-end

more front end
added direct payment method for authorize.net
fixed merge conflict in users/edit
Merge branch 'master' into admin

Conflicts:
	.gitignore