Working log in page, added methods to controller and model.
Merge pull request #2 from gloriamaris/KEVIN-employee_list_module_07/10/2014

Department List
Added "Department" option on navigation sidebar.
Merge pull request #4 from izephyrmor/master

Added "Department" option on navigation sidebar.
Added "JS Modal Forms" to "Add" buttons on Team and Department Lists. Worked on module features.
Merge pull request #6 from izephyrmor/KEVIN-team_list_module_07/11/2014

Added "JS Modal Forms" to "Add" buttons on Team and Department Lists. Wo...
change in announcement table

change in announcement table
announcement table changes

announcement table changes
announcement changes

announcement changes
updates in announcement module
Merge branch 'master' of https://github.com/jeffreycanoy92/OSNET-1 into JEFFREY-announcements_table_db_change_07/11/2014

Conflicts:
	application/config/config.php
	application/controllers/home.php
Merge branch 'KEVIN-team_list_module_07/11/2014' of https://github.com/jeffreycanoy92/OSNET-1 into JEFFREY-announcements_table_db_change_07/11/2014

Conflicts:
	application/controllers/home.php
Merge branch 'MONIQUE-user_login_07/10/2014' of https://github.com/jeffreycanoy92/OSNET-1 into JEFFREY-announcements_table_db_change_07/11/2014

Conflicts:
	application/controllers/home.php
announcement module
announcement module

files:
models:
 annoucement_m

controller:
home
announcement_ajax

js
 home.js

views
home
announcement module

controllers
announcement_ajax
home

models
annoucement_m

views
home
header_home

js
home.js
test
test
announcement module

controllers
announcement_ajax
home

models
annoucement_m

views
home
header_home

js
home.js
announcement module

controllers
announcement_ajax
home

models
annoucement_m

views
home
header_home

js
home.js