Merge pull request #1 from snipertomcat/master

getting branches merged and up to date
gitignore updated
Merge pull request #4 from TheDesignAffiliatesInc/master

updated gitignore