mainjs in welcome#index view
fixing the favicon
Merge branch 'master' of github.com:fijimunkii/hintr
merging branch
Merge branch 'master' of github.com:fijimunkii/hintr
fixing the favicon
ready to set up landing page
Merge branch 'master' of github.com:fijimunkii/hintr
Merge branch 'master' of github.com:fijimunkii/hintr
landing page flow + watched_intro boolean
Merge branch 'master' of github.com:fijimunkii/hintr
Merge branch 'master' of github.com:fijimunkii/hintr
fixed the login with FB button for the index.html.erb
added header, nav bar with the logo
working on the header
Koala API::Error handling and like TYPE!
Merge pull request #6 from DeProdigy/master

	working on the header
Merge branch 'master' of github.com:fijimunkii/hintr
updates header