added comma to ability.rb to fix bug
added test images, and fixed interpolation bug in users_controller.rb and haml for new user reg
deleted superfluous files
Merge branch 'master' into development_a
modified new user reg and commented out cancan
Merge branch 'master' of github.com:asrkennedy/uniFi
fix friend bug by commenting out cancan in app_cont, users_cont, haml edit user account, edit user_image, edit own account and view users
Merge branch 'master' into development_a