Added a support for extra tasks in main and in source

Changed argument parsing in main(), changed align() prototype and code.
Merge branch 'master' of https://github.com/totruok/Test

Conflicts:
	include/header.h
	src/main.cpp
	src/source.cpp
Merge branch 'master' of https://github.com/totruok/Test

Conflicts:
	include/header.h