updated UserType.php form
added handling users through doctrine; added fixtures
minor fixes to main page
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: Adash <vagrant@vagrant-debian-squeeze-64.vagrantup.com>
#
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#	new file:   .idea/codeStyleSettings.xml
#	modified:   .idea/medIt.iml
#	modified:   .idea/vcs.xml
#	modified:   .idea/workspace.xml
#	modified:   app/AppKernel.php
#	modified:   app/config/security.yml
#	modified:   composer.json
#	modified:   composer.lock
#	modified:   src/Adsh/MeditBundle/Controller/DefaultController.php
#	modified:   src/Adsh/MeditBundle/Entity/Merit.php
#	new file:   src/Adsh/MeditBundle/Resources/public/img/.DS_Store
#	renamed:    src/Adsh/MeditBundle/Resources/public/img/logo.png -> src/Adsh/MeditBundle/Resources/public/img/logo copy.png
#	new file:   src/Adsh/MeditBundle/Resources/public/img/logo.jpg
#	modified:   src/Adsh/MeditBundle/Resources/public/img/logo.png
#	modified:   src/Adsh/MeditBundle/Resources/views/.DS_Store
#	modified:   src/Adsh/MeditBundle/Resources/views/Default/index.html.twig
#	new file:   src/Adsh/MeditBundle/Resources/views/Default/welcome.html.twig
#	modified:   src/Adsh/UserBundle/Controller/LoginController.php
#	new file:   src/Adsh/UserBundle/DataFixtures/.DS_Store
#	new file:   src/Adsh/UserBundle/DataFixtures/ORM/.DS_Store
#	new file:   src/Adsh/UserBundle/DataFixtures/ORM/LoadUsers.php
#	modified:   src/Adsh/UserBundle/Entity/User.php
#	modified:   web/config.php
#
updated fixtures and database relationships