Added propel runtime folder to gitignore
Merge pull request #5 from mhitza/ignore-app-propel

Added propel runtime folder to gitignore
Adding basic user functionality
Merge pull request #7 from WhiteWolf99/base_user

Adding basic user functionality
Installing twitter bootstrap bundle
finalize instalation for twitter bootstrap
twitter bootstrap final configurations
adding node modules to gitignore
twig usage example
updated instalation file
Merge pull request #9 from WhiteWolf99/twitter_bootstrap

Fixes #4
ignoring netbeans project
Merge pull request #10 from WhiteWolf99/netbeans_ignore

ignoring netbeans project
Created the WorkinHoursBundle for TimeScheduling
Created TimeScheduling and WorkingHoursBundle
Updated model and schema configuration.
Added fixture for the Day table
Updated fixtures with day interval
Added basic form for day interval (WorkingHours)
Merge branch 'working-hours' of github.com:mhitza/time-frame into working-hours

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
	src/RMT/TimeScheduling/WorkingHoursBundle/Controller/DefaultController.php
	src/RMT/TimeScheduling/WorkingHoursBundle/Resources/config/routing.yml
	src/RMT/TimeScheduling/WorkingHoursBundle/Resources/fixtures/DayInterval.xml
	src/RMT/TimeScheduling/WorkingHoursBundle/Resources/views/Default/index.html.twig