anton
Merge branch 'develop' of https://github.com/ajijohn/holiday2 into develop

adding twitter, spotify, main layout from Aji's dev branch
Merge branch 'develop' of https://github.com/ajijohn/holiday2 into develop
added login FB