Merge branches 'dev' and 'master' into dev
phewwww, this is fifth time im correcting the favicon. I hope this time it doesn't go vanished.
added responsive carousel
Merge branches 'master' and 'dev'
Merge branches 'heroku' and 'master' into heroku