- you can only manage books now from home and index
- upgraded edit faq module
- upgraded edit faq module
- added help_view and help() function in home
- Finished edit faq module
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/home.php
	application/views/announcements_view.php
	application/views/search_results_view.php
	css/style3.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/home.php
	application/views/announcements_view.php
	application/views/search_results_view.php
	css/style3.css
-renamed nicEdit src to compressed file
-renamed nicEdit src to compressed file
-renamed nicEdit src to compressed file
-renamed nicEdit src to compressed file
resolved conflicts
Merge branch 'team1/dev' of https://github.com/BuracayBeach/myfirstrepo into team1/dev
Merge pull request #154 from BuracayBeach/team1/dev

Team1/dev