changing the time out back, since it takes longer to serve reuest
Merge branch 'beta' of github.com:teamleada/teamleada.com into beta
Merge branch 'master' of github.com:teamleada/teamleada.com into beta
update beta timeout unicorn
commit diff in unicorn timeout
actually fixing the merge issue
Merge branch 'beta' of github.com:teamleada/teamleada.com into beta
Merge branch 'beta' of github.com:teamleada/teamleada.com into beta