Initial commit
Add Framework and ReadMe
Add Files and ReadMe
Add Kolexia HomePage
Add Login, Register & Shopping Cart Design & Implementation
Merge branch 'master' of https://github.com/kampoengboy/Kolexia

Conflicts:
	application/views/pages/home.php
	application/views/templates/header.php
	home.css
Add Login, Register, Home Page, Shopping Cart Design
Merge branch 'master' of https://github.com/kampoengboy/Kolexia

Conflicts:
	application/views/pages/home.php
	application/views/templates/header.php
	home.css
Fix Problem
Merge commit '0a6acc36c234be8adffd716da47d3599afe32504' into HEAD

Conflicts:
	application/views/pages/home.php
	application/views/templates/header.php
	home.css
Fix Problem
Merge pull request #1 from kampoengboy/HEAD

Head
Edit Home Page
Edit Home Page
add bootstrap assets and flat-ui
Create Proposal.docx
Merge pull request #2 from Jimmytanuwijaya/master

Create Proposal.docx
Merge branch 'master' of https://github.com/fr3ndyl33/Kolexia
Edit Tugas Proposal
Edit Title