Added test file
Merge branch 'costa' into schi

added user_sessions which has login pages
Login page (WIP)
changed app/views/user_sessions/index.html.erb to have login on the button name... probably should change to welcome though
Login WIp2
Login first draft done
Login bugfixing/bugmaking
removed public/index.html, edited thoughts/index.html some
work on log in form
Merge branch 'schi' of https://github.com/saulcosta18/vybe into schi

Conflicts:
	trunk/app/views/user_sessions/_form.html.erb
working on friends
Merge branch 'schi' of https://github.com/saulcosta18/vybe into schi
apparently we need some data validations