fixed placeholder
responsive css
conflict fixes
Merge pull request #9 from eddiesanmarco/eddie

Eddie