Removed .htaccess on production server.
Merge branch 'master' of github.com:jordanlgraham/handsomedog
Merge branch 'master' of github.com:jordanlgraham/handsomedog
Automatic merge failed; manually applying merge commits.
Merge pull request #7 from jordanlgraham/manual_merge

Manual merge