Styled homepage and login
merge tool bs
Merge pull request #3 from rajangdavis/stylehomepage

Stylehomepage
Merge branch 'master' into ericapi
front end solution...
Merge pull request #4 from rajangdavis/makefrontend

front end solution...
Merge branch 'master' into ericapi
pushing to heroku
checked precompile, error in deploying, trying again
Set environment to production, precompiled assets..
stupid ssl protocols, updated links on the application.html.erb because of http vs. https
gif making working
resolved merge conflicts
Merge pull request #5 from rajangdavis/addinggifmaking

gif making working, going to deploy to heroku
Merge branch 'master' into ericapi
adding in gif maker
working gif on stream page
Merge branch 'master' of https://github.com/rajangdavis/piknik2.0
Merge pull request #6 from rajangdavis/gifonpage

Gifonpage
Merge branch 'master' into ericapi