I don't even know !
Merge branch 'master' of https://github.com/Fathalian/Cartman

# By Zaryafaraj
# Via Zaryafaraj
* 'master' of https://github.com/Fathalian/Cartman:
  scripts for about page not working. bootstrap not working after new angular version installed.
  manifesto and about page

Conflicts:
	app/scripts/controllers/explore.js