pullin
fixing git error
had to rework a lot of stuff, but its now ajaxing properly
had to rework a lot of stuff, but its now ajaxing properly
going to switch to doing something else, this is annoying
merging
merging
Merge branch 'eventbrite' of https://github.com/dbcfoxes2014/free_candy
Merge branch 'merge2' into merging_master
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy
merging
Merge pull request #111 from dbcfoxes2014/merging_master

Merging master
Merge branch 'master' into sidekick_render
merging master