fixed CSS conflict between pages
fixed merge conflict in app view
Merge branch 'master' of https://github.com/NeilMakn/kix_rails
Added log in link and deleted a bunch of assets from public
Merge branch 'master' of https://github.com/NeilMakn/kix_rails into logout
Merge pull request #49 from NeilMakn/logout

Added login link and deleted a bunch of assets in public folder