Fixed baseurl
Fixed index page
Fixed merging problem in javascript files
Last commit before project submission
Merge branch 'master' of https://github.com/tkesgar/ngidesehat