Merge remote branch 'upstream/master'
Added gitignore and Rails 4 upgrade gem
fixed merge conflicts
added fastclick js
Merge pull request #3 from rpearce/master

Added gitignore and rails 4 upgrade gem