Adding support to if execution. Temporary commit for merging.
Merge branch 'master' of github.com:sancospi/frontend
Finished correct if execution
Merge branch 'master' of github.com:sancospi/frontend