Added content on the main page
Corrected image
Starting jquery front end module
Merge conflict
Removed jquery FUNNY feature
Corrected highlighting buttons
first commit app charibou
Merge branch 'master' of https://bitbucket.org/Scheiicode/ndi
getuser