Test commit
Grunt file
Git ignore modified
Grunt file and package.json modified
Deleted unnecessarry files
Added styles.css file
Added styles.scss file where imports are added
Bootstrap and template styles added
jQuery added into template
First html layout loaded
Removed alert from JS
Loaded first layout with bootstrap style
Added bootswatch css library and one block of text
Some basic data entered
Merge branch 'feature/layoutPrepare' into develop
Merge branch 'release/0.1'

Conflicts:
	application/controllers/MY_Controller.php