i said something
fixing merge issue
adding stuff
Merge pull request #3 from acdevine89/master

Adding more innuendos
fixed merge issue
i added text
Fixing .gitnore .iml issues. No need to track .iml. Changing build.gradle to SDK 19 instead of 20.
Delete app.iml

Deleting THIS. OOOPS.
Merge remote-tracking branch 'origin/master'
Fixed .gitignore. Fixed build.gradle. Removed app.iml.
Merge pull request #2 from elyselturner/master

i said something
Adding some dummy Yummy! and Bleh. buttons at the bottom of the main layout.
styalized the buttons and added our name at the top of the page
Merge pull request #4 from elyselturner/master

styalized the buttons and added our name at the top of the page
Making the Action Bar our hot, hot orange.
I switched the locations of the buttons
Merge pull request #5 from elyselturner/master

I switched the locations of the buttons
Changing header text to display our tagline. Changing Action Bar font size to be larger. Making Android logo transparent.
Adding toasts to clicking the like and dislike buttons.
Adding a common dimen for the button width, making buttons the same width.