Merge branch 'master' into rissa
Merge branch 'master' into rissa
Added flags
Changes with flags
fixed the layout! don't break it!!! lol
Merge pull request #46 from TAwesome/rissa

Rissa
Merge branch 'master' into jill

Conflicts:
	app/views/TAhome.blade.php