d
Merge branch 'master' of https://github.com/ikrogers/FLATS
Merge branch 'ilya'
bugfixes
Made devise default login pages pretty
Added registration form field need to update controller