Latest treehouse
Merge branch 'david' of https://github.com/RajatBhageria/Waywo into david

Conflicts:
	trial3/log/development.log

trial3/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c
0953

trial3/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc0661
0705

trial3/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e9458
6655

trial3/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35b
b0d6

trial3/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b
63af
	trial3/tmp/pids/server.pid