Merge branch 'master' of https://github.com/Bearded-Hen/Android-Bootstrap

Conflicts:
	AndroidBootstrap/res/layout/bootstrap_edit_text.xml
	AndroidBootstrapTest/res/layout/activity_main.xml

AndroidBootstrapTest/src/com/beardedhen/androidbootstraptest/MainActivit
y.java
	README.md

Author: Danielle Vass

.gitignore

@@ -59,3 +59,4 @@ build/
 #for oh-my-zsh jira plugin (https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#jira)
 .jira-url
 atlassian-ide-plugin.xml
+