Project migrated to MyEclipse using JSP
Merge branch 'dev' of https://github.com/misdake/misdake.github.io into dev

confilicts fixed

Conflicts:
	.gitignore