MERGE
MERGE
SYNCING
Merge branch 'master' of https://github.com/didyoueven/bulbasaur-web

Conflicts:
	db/development.sqlite3
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6