make_a_wish.html
Merge branch 'master' of https://github.com/craighiller/serendipity

Conflicts:
	views/login.html