Symfony
Merge branch 'symfony'

Conflicts:
	symfony/notejam/src/Notejam/UserBundle/Tests/Controller/UserControllerTest.php
Docs: Edited readme
Merge branch 'symfony'
Rubyonrails: Installation
Rubyonrails: Added initial readme file
Rubyonrails: Generated initial user controller
Rubyonrails: readme
Rubyonrails: Edited readme (how to run tests)
Rubyonrails: Added basic note controller
Rubyonrails: Added basic empty pad controller
Rubyonrails: Method signatures in user controller
Rubyonrails: Changed user controller
Rubyonrails: Edited config
Rubyonrails: Edited routes
Rubyonrails: Edited routes
Merge branch 'symfony'

Conflicts:
	symfony/notejam/src/Notejam/UserBundle/Tests/Controller/UserControllerTest.php
Rubyonrails: Configured routes.rb
Rubyonrails: Configured layouts
Docs: Edited readme