nothing
Merge branch 'master' of github.com:ariunbayar/fall

Conflicts:
	index.html
set column
Merge branch 'master' of github.com:ariunbayar/fall

Conflicts:
	static/css/main.css