Merge pull request #4 from solaris18/master

add wikucup 2012 gallery
Merge pull request #7 from solaris18/master

merge
add schedule
Merge commit '5ebe9e54ff440a576c0a2a4b67f3a21b4ff01e03'

Conflicts:
	index.html