ac
ac
Merge branch 'master' of https://github.com/dhineshns/wiki_on_the_internet

Conflicts:
	app/resources.py