Merge pull request #7 from JackBranding/master

Merge pull request #4 from jerturowetz/master
Merge pull request #4 from jerturowetz/master

update gitignore
remove custom uploads folder
Merge pull request #5 from jerturowetz/master

remove custom uploads folder
Merge pull request #8 from BKDSN/master

Merge pull request #4 from jerturowetz/master
Merge pull request #5 from jerturowetz/master

remove custom uploads folder
remove custom uploads folder
remove custom uploads folder
Merge pull request #9 from JackBranding/master

Merge pull request #5 from jerturowetz/master
Merge pull request #6 from jerturowetz/master

remove custom uploads folder
Merge pull request #10 from BKDSN/master

remove custom uploads folder
Merge pull request #6 from jerturowetz/master

remove custom uploads folder
Merge pull request #11 from JackBranding/master

Merge pull request #6 from jerturowetz/master
Merge pull request #7 from jerturowetz/master

remove custom uploads folder
add wp-uploads folder
remove custom uploads folder from .gitignore
Merge remote-tracking branch 'origin/master'
Merge pull request #12 from JackBranding/master

Merge pull request #7 from jerturowetz/master
Merge pull request #13 from BKDSN/master

Merge pull request #6 from jerturowetz/master
Merge remote-tracking branch 'boilerplate/master'