Signed-off-by: unknown <dre.paperhouse@gmail.com>
Made changes to rulecontroller and rulemodel
Merge branch 'master' of https://GitHub.com/jraguirre2013/SDAT-2013

Conflicts:
	ignite/application/views/login_view.php
	ignite/application/views/navbar.php

Signed-off-by: unknown <dre.paperhouse@gmail.com>