Controllers ready
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/Gemfile
Merge pull request #3 from tihuan/master

Controllers ready