pulling from upstream
pulling from upstream
pulling from upstream
fixing merge problems
take off the pull limit
fixed the media query login button
finished mixpanel
Merge pull request #41 from DeProdigy/master

finished mixpanel