Merge branch 'master' of https://github.com/Lincolnnus/OneManU

Conflicts:
	css/style.css
Before Merging
Merged