commit X
commit Y
commit Z
Merge branch 'first_ui_step'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
bootsrtap 3
git ignore
git ignore fix 2
git ignore fix 3
git ignore fix 3
git ignore fix 3
git ignore fix 4
rake task for getting inbox messages to db
Merge pull request #3 from CyberEagles/features

Features