commit to pull
Merge branch 'master' of https://github.com/Lefty-San/fluffy

Conflicts:
	app/assets/javascripts/neatpeople.js.coffee
	app/assets/stylesheets/neatpeople.css.scss
page switch keylog