Weather plugin
Merge branch 'master' of https://github.com/joellusky/ReminderApp

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of https://github.com/joellusky/ReminderApp