Codeigniter files to ignore
Adding an htaccess for Codeigniter
Merge branch 'master' of github.com:alexstuckey/umpire