Add features

Bootstrap,Two Line chart and playing with views.
Merge branch 'master' of https://github.com/jvegadol07/FalconSocialTestJaimeVega

Conflicts:
	js/organizUser.js