controllers(?) done
Merge pull request #1 from cybern223/khan2

controllers done