precompiled assets
fixed merge conflict in invites controller
merged turbolinks change
fixed merge conflict
precompiled assets
resolved merge conflict in new contact template
Merge pull request #50 from kaplanoah/master

Removed merge conflicts