for deployment
Merge branch 'master' of https://github.com/jeshuamaxey/ferret
Merge branch 'master' of https://github.com/jeshuamaxey/ferret
Merge branch 'master' of https://github.com/jeshuamaxey/ferret
Merge branch 'master' of https://github.com/jeshuamaxey/ferret
Merge branch 'master' of https://github.com/jeshuamaxey/ferret
keeping server
Merge branch 'master' of https://github.com/jeshuamaxey/ferret
merge with site
Merge branch 'master' of ec2-54-76-162-98.eu-west-1.compute.amazonaws.com:hub
added missing twitter icon
sessionfix
site merge
session fix