removed home/ubuntu/Documents/Aptana Studio 3 Workspace_temp/prototype/.git/index.lock
Merge branch 'master' of https://github.com/ypodo/prototype

Conflicts:
	app/controllers/users_controller.rb