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
worked on authlogic in the application_controller.rb
Created some tests and works on User uniqueness, validations and format
Added a profile controller
Have profile pages working... but you have to naviagte to /1 instead of /saulcosta because otherwise the @user varaible doesn't populate
Have the profile page touched up, displays the username and the name of the emotion for each thought
Made it so a user can only post thoughts for them selves and when the edit a thought they cannot post it under someone else
Worked on user connections and profile page. Now just need to make the new connection actually do it in the database...