updated noConflict method to work, now requires passing a new name to it
Merge branch 'master' of https://github.com/ehudokai/bootstrap