Merge pull request #4 from jpbudi11/master

Trying this out....
WTF
Hopefully this will work.

Lost everything..... trying to get my commits to work and resolving
merge conflicts. This is a huge commit because of merge conflicts and
Git crashing. My other commit history will hopefully show up after I
publish/push this.
More merge conflict resolutions
Attempting to push to heroku and resolve these ridiculous issues
Merge pull request #4 from Tripleberryflip/master

Pull Request for sync