end

end
Merge branch 'gh-pages' of https://github.com/ajikcey/miszki.github.io into gh-pages

Conflicts:
	api.php